textview: Unset bubble timeout ID right after requesting the clipboard
authorCarlos Garnacho <carlosg@gnome.org>
Thu, 21 Aug 2014 15:43:10 +0000 (17:43 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Fri, 22 Aug 2014 11:24:56 +0000 (13:24 +0200)
The timeout ID used to be unset after we got the targets from the
clipboard, but there's still a moment between the clipboard request and
the GDK_SELECTION_NOTIFY event that the ID points to an already gone
timeout.

gtk/gtktextview.c

index 6e283af0970830c79e203c7937b03a3789e3a4bd..59c3819780050a835f5dd9ad90c938396cfdb312 100644 (file)
@@ -9051,8 +9051,6 @@ bubble_targets_received (GtkClipboard     *clipboard,
 
   gtk_popover_set_pointing_to (GTK_POPOVER (priv->selection_bubble), &rect);
   gtk_widget_show (priv->selection_bubble);
-
-  priv->selection_bubble_timeout_id = 0;
 }
 
 static gboolean
@@ -9064,6 +9062,7 @@ gtk_text_view_selection_bubble_popup_cb (gpointer user_data)
                                  gdk_atom_intern_static_string ("TARGETS"),
                                  bubble_targets_received,
                                  text_view);
+  text_view->priv->selection_bubble_timeout_id = 0;
 
   return G_SOURCE_REMOVE;
 }